More const-correct in endian and rgbcolors.

diff --git a/defs.h b/defs.h
index 4c8ea1bebbe7a0c4105a72d8425651d8ceb3eb7c..521ae464c27edebf527fc1721166edbb6dfacc9f 100644 (file)
--- a/defs.h
+++ b/defs.h
@@ -923,8 +923,8 @@ void be_write32(void *pp, const unsigned i);
 void le_write16(void *pp, const unsigned i);
 void le_write32(void *pp, const unsigned i);
 
-double endian_read_double(void* ptr, int read_le);
-float  endian_read_float(void* ptr, int read_le);
+double endian_read_double(const void* ptr, int read_le);
+float  endian_read_float(const void* ptr, int read_le);
 void   endian_write_double(void* ptr, double d, int write_le);
 void   endian_write_float(void* ptr, float f, int write_le);
 
@@ -933,8 +933,8 @@ double be_read_double(void *p);
 void   be_write_float(void *pp, float d);
 void   be_write_double(void *pp, double d);
 
-float  le_read_float(void *p);
-double le_read_double(void *p);
+float  le_read_float(const void *p);
+double le_read_double(const void *p);
 void   le_write_float(void *ptr, float f);
 void   le_write_double(void *p, double d);
 
@@ -1015,7 +1015,7 @@ int nmea_cksum(const char *const buf);
 /*
  * Color helpers.
  */
-int color_to_bbggrr(char *cname);
+int color_to_bbggrr(const char *cname);
 
 /*
  * A constant for unknown altitude.   It's tempting to just use zero

diff --git a/rgbcolors.c b/rgbcolors.c
index bfbe0f035c50023975b0168b874d220d4df72df8..b899961576cb18fecda526b2237dbb94f8bb58ab 100644 (file)
--- a/rgbcolors.c
+++ b/rgbcolors.c
@@ -27,8 +27,8 @@
  * same colors supported by X11.
  */
 
-static struct {
-       char *cn;
+static const struct {
+       const char *cn;
        unsigned char r;
        unsigned char g;
        unsigned char b;
@@ -202,7 +202,7 @@ static int HexDigit( char hex ) {
        return 0;
 }
 
-static int HexByte( char* hex ) {
+static int HexByte( const char* hex ) {
        int b =  (HexDigit(hex[0])<<4)+HexDigit(hex[1]);
        return b;
 }
@@ -216,7 +216,7 @@ static int HexByte( char* hex ) {
  */
  
 int
-color_to_bbggrr( char *opt_color ) 
+color_to_bbggrr( const char *opt_color ) 
 {
        int color_num;
        unsigned int i;

diff --git a/util.c b/util.c
index f7f6d0a1ea55fe55d97ac4af28775a58485252c7..0054c2324fcf0eb4d5b11f57fb56554c44042049 100644 (file)
--- a/util.c
+++ b/util.c
@@ -958,11 +958,11 @@ get_cache_icon(const waypoint *waypointp)
 }
 
 double
-endian_read_double(void* ptr, int read_le)
+endian_read_double(const void* ptr, int read_le)
 {
   double ret;
   char r[8];
-  void *p;
+  const void *p;
   int i;
   
   if ( i_am_little_endian == read_le ) {
@@ -988,11 +988,11 @@ endian_read_double(void* ptr, int read_le)
 }
 
 float
-endian_read_float(void* ptr, int read_le)
+endian_read_float(const void* ptr, int read_le)
 {
   float ret;
   char r[4];
-  void *p;
+  const void *p;
   int i;
   
   if ( i_am_little_endian == read_le ) {
@@ -1055,7 +1055,7 @@ endian_write_float(void* ptr, float f, int write_le)
 }
 
 float
-le_read_float( void *ptr ) {return endian_read_float(ptr, 1);}
+le_read_float( const void *ptr ) {return endian_read_float(ptr, 1);}
 
 void
 le_write_float( void *ptr, float f ) {endian_write_float(ptr,f,1);}
@@ -1067,7 +1067,7 @@ void
 be_write_float( void *ptr, float f ) {endian_write_float(ptr,f,0);}
 
 double 
-le_read_double( void *ptr ) {return endian_read_double(ptr,1);}
+le_read_double( const void *ptr ) {return endian_read_double(ptr,1);}
 
 void
 le_write_double( void *ptr, double d ) {endian_write_double(ptr,d,1);}